fs: Add MODULE_SOFTDEP declarations for hard-coded crypto drivers

Bug-Debian: https://bugs.debian.org/819725
Forwarded: https://lore.kernel.org/all/20160517133631.GF7555@decadent.org.uk/

This helps initramfs builders and other tools to find the full
dependencies of a module.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
[Lukas Wunner: Forward-ported to 4.11: drop parts applied upstream]

Gbp-Pq: Topic bugfix/all
Gbp-Pq: Name fs-add-module_softdep-declarations-for-hard-coded-cr.patch

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index efd3ff3ba587d2087ec59b28316922e15bfb2aa7..f4c69869d4f377bcdfb282cf5c078e91f85a3338 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2577,7 +2577,7 @@ late_initcall(init_btrfs_fs);
 module_exit(exit_btrfs_fs)
 
 MODULE_LICENSE("GPL");
-MODULE_SOFTDEP("pre: crc32c");
+MODULE_SOFTDEP("pre: crypto-crc32c");
 MODULE_SOFTDEP("pre: xxhash64");
 MODULE_SOFTDEP("pre: sha256");
 MODULE_SOFTDEP("pre: blake2b-256");

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 4866657c6d41fff18dbc401f68213f3bc0716eaf..0c2ce1350c2629dd50d18e9c712d63e4aa6cd86a 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -7446,6 +7446,6 @@ static void __exit ext4_exit_fs(void)
 MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
 MODULE_DESCRIPTION("Fourth Extended Filesystem");
 MODULE_LICENSE("GPL");
-MODULE_SOFTDEP("pre: crc32c");
+MODULE_SOFTDEP("pre: crypto-crc32c");
 module_init(ext4_init_fs)
 module_exit(ext4_exit_fs)

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index b6c114c11b97877e7f86a9366ef63bad0d81bf01..b01c6f59af52153fc67e57e374fe3e0e5b2b9004 100644 (file)
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -3182,6 +3182,7 @@ static void __exit journal_exit(void)
 }
 
 MODULE_LICENSE("GPL");
+MODULE_SOFTDEP("pre: crypto-crc32c");
 module_init(journal_init);
 module_exit(journal_exit);
 

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index d8f54eb7455e37418d8f2b84e42732f339d48417..b7daba04b1312eed27f2aada3f51a0e5d6db7175 100644 (file)
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1785,5 +1785,8 @@ static void __exit exit_nfsd(void)
 MODULE_AUTHOR("Olaf Kirch <okir@monad.swb.de>");
 MODULE_DESCRIPTION("In-kernel NFS server");
 MODULE_LICENSE("GPL");
+#ifdef CONFIG_NFSD_V4
+MODULE_SOFTDEP("pre: crypto-md5");
+#endif
 module_init(init_nfsd)
 module_exit(exit_nfsd)